Skip to content

Point leftover Invite to this Bot copy at Sharing → Copy invite link - #515

Merged
Birfy merged 12 commits into
ThinkFlowLab:mainfrom
Birfy:fix/506-invite-copy-leftovers
Oct 20, 2026
Merged

Birfy merged 12 commits into
ThinkFlowLab:mainfrom
Birfy:fix/506-invite-copy-leftovers

Conversation

@Birfy

@Birfy Birfy commented Oct 20, 2026 •

Copy link
Copy Markdown
Collaborator

Fixes #506.

What

After #499/#504 renamed the Sharing control to Copy invite link for <Bot>, host refusal text, the new-chat invite failure note, and zh i18n still said Bot settings → Invite to this Bot. This PR retargets those user-visible strings (and matching docs/comments/tests) to Bot settings → Sharing → Copy invite link.

Based on fix/499-invite-friendchat-polish (#504) with origin/main merged in so the leftover copy lands on top of the rename.

Why

Those messages pointed at a button that no longer exists once #504 lands.

Test

  • ARCH_DOCS_BASE=origin/main TZ=UTC npm run verify — pass (0 failures) at tip
  • core/test/remote-room.test.js ungranted-local assertion updated to Sharing → Copy invite link for Writer A

Risk tier

Risk tier: T2 (estimate; the controller sets the label) — copy/docs/i18n only, no grant or transport behavior change.

Tip SHA: 6e7e9e6

Docs-not-needed: copy-only string and comment updates in owned files (core-client, core-host, plugin-runtime, tree); no subsystem doc names the old "Invite to this Bot" control, and social.md / team.md carry the doc change.

Birfy added 4 commits October 20, 2026 14:08
…t, one invite control, Add friend auto-close, Sharing hint (ThinkFlowLab#499)
…ThinkFlowLab#481/ThinkFlowLab#501/ThinkFlowLab#505)

Keep ThinkFlowLab#499 composer-label / data-placeholder docs with ThinkFlowLab#481 phone hold-card targets.
Regenerated client bundle patch after merge.
…FlowLab#504)

Keep ThinkFlowLab#499 composer-label wording and ThinkFlowLab#362 phone hold-card targets.
Client-bundle patch will be regenerated with the ThinkFlowLab#506 string fixes.
Fixes ThinkFlowLab#506. Host refusal, i18n/zh, new-chat fix note, tests, and docs/comments
now match the ThinkFlowLab#499/ThinkFlowLab#504 Sharing button rename.

Docs-not-needed: false (social.md / team.md updated)
@Birfy Birfy added agent-pr Pull request opened by an agent bug Something isn't working labels Oct 20, 2026
@Birfy Birfy self-assigned this Oct 20, 2026
@Birfy Birfy added area:ui Web/desktop UI and copy area:social Friends, invites, grants, Bot Social labels Oct 20, 2026
@Birfy Birfy added the awaiting-approval PR is green and waits for the maintainer's approval (T2/T3) or a review PASS at its tip label Oct 20, 2026

@Birfy Birfy left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Self-review: PASS
Tip SHA: 6e7e9e6
Ran:

  • Worker: ARCH_DOCS_BASE=origin/main TZ=UTC npm run verify passed; CI tests-ok green at tip.
    Not run:
  • Live UI after #504 merge (stack: merge #504 before this).
    Notes: copy/i18n leftovers only; Risk tier T2 in body. Merge after #504.

@Birfy
Birfy added this pull request to the merge queue Oct 20, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Oct 20, 2026
Birfy added 2 commits October 20, 2026 16:04
Resolve social.md and social client with main's Share with a friend (ThinkFlowLab#500/ThinkFlowLab#516)
kept under OwnBotSharing alongside ThinkFlowLab#499 inviteControls and revoke hint.
Regenerate core client bundle and ds-bot patches. Update ThinkFlowLab#499 test for the
extra ShareWithFriend child.
Keep ThinkFlowLab#506 Sharing → Copy invite link naming and ThinkFlowLab#499 OwnBotSharing polish;
wire main's Share with a friend (ThinkFlowLab#500/ThinkFlowLab#516) into OwnBotSharing. Regenerate
client bundle and ds-bot patches.
@Birfy

Birfy commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Self-review: PASS
Tip SHA: 9fdb694
Ran:

  • ARCH_DOCS_BASE=origin/main TZ=UTC npm run verify (pass)
  • reviewed diff at tip vs owner design rules
    Not run:
  • live Mac instances / production Bot Social

@github-actions github-actions Bot added the risk:T3 Risk tier T3 (needs a human approval), set by the controller from the diff label Oct 20, 2026
Birfy added 2 commits October 20, 2026 17:59
…chat-polish

# Conflicts:
#	patches/ds-bot/0008-client-bundle.patch
…/Birfy/FlyBot into fix/506-invite-copy-leftovers

# Conflicts:
#	patches/ds-bot/0008-client-bundle.patch
@Birfy

Birfy commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Self-review: PASS
Tip SHA: bf85bfd
Ran:

@Birfy
Birfy added this pull request to the merge queue Oct 20, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 20, 2026
@Birfy
Birfy added this pull request to the merge queue Oct 20, 2026
@Birfy
Birfy removed this pull request from the merge queue due to a manual request Oct 20, 2026
@Birfy
Birfy added this pull request to the merge queue Oct 20, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Oct 20, 2026
…eftovers

# Conflicts:
#	patches/ds-bot/0008-client-bundle.patch
@Birfy

Birfy commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Self-review (review-pr, Birfy reviewer agent, 2026-10-20 20:41 Asia/Shanghai): PASS (merge-main conflict fix; no feature change)

Tip SHA: cb7cb2f
Ran:

  • git merge origin/main twice into the branch, no rebase or force-push: first b6e89d2 (with Polish invites and friend chats: friend Bot placeholder, one invite control, Add friend auto-close, Sharing hint #504 now on main, so this PR is no longer stacked and its diff vs main is just the Host/core messages and zh strings still say 'Bot settings → Invite to this Bot' after #504 #506 copy change), then cf61952 (after Name a friend's Bot one way and approval cards by the receiving person #502, which landed while this was being checked) → pass. The first merge's only conflict was the generated patches/ds-bot/0008-client-bundle.patch. The second merge was clean. No hand-merged real sources
  • generated files regenerated, not hand-merged, after each merge: git checkout origin/main -- patches/ds-bot, (cd core && npm run build), node scripts/ds-bot-patches.mjs generate, check → pass (10 patches apply cleanly; core/ = ds-bot/ + patches)
  • ARCH_DOCS_BASE=origin/main TZ=UTC npm run verify (core lint + arch-docs OK with 24 changed files, plugin lint, build-client --check, ds-bot-patches check, all suites) → pass, 0 failures (core 1114, social 313, tree 83, timeline 93, .github scripts 93, interop 37, live-e2e 16)
  • smoke (PR touches core/src/host/ copy in hooks.js, reach.js, room-membership.js): CONTEXT_WINDOW=100000 CHECK_RATIO=0.45 dev/bench.sh smoke515 3297 8997 reset && node dev/smoke.mjs smoke515 3297 against DSH 0.2.0-rc.2, on the cf61952 merge → pass, all 42 steps; bench stopped afterwards
  • CI on this tip → all checks pass (tests-ok, ubuntu-latest · Node 24 · DSH 0.2.0-rc.2, plugins social/timeline/tree, package, risk tier, reviewed tip); MERGEABLE / CLEAN
  • re-read the diff against main at this tip: 24 files, every change replaces leftover "Invite to this Bot" copy with Sharing → Copy invite link. One changelog.d fragment (506-invite-copy-leftovers.fixed.md), no CHANGELOG.md or ds-bot/ edits, no node_modules links committed
    Not run:
  • live Mac instances / DSH Desktop / real-model live-e2e (no key; mock model only)
  • production Bot Social (not in scope)
    Verdict: PASS

Findings: none to act on. This review does not authorize a merge: risk:T3 still needs the maintainer's approval (the owner queues it).

@Birfy
Birfy added this pull request to the merge queue Oct 20, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 20, 2026
Birfy added 2 commits October 20, 2026 22:05
Docs-not-needed: copy-only string and comment updates in owned files (core-client, core-host, plugin-runtime, tree); no subsystem doc names the old "Invite to this Bot" control, and social.md / team.md carry the doc change.
@Birfy

Birfy commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Verifier report (review-pr), PR #515

Verdict: PASS at ae902933acaf8bc2ec68c55a044dec654838994d. Self-review by the owner's reviewer agent (Birfy, selfReview). Rules loaded from origin/main: AGENTS.md, LESSONS.md, docs/code-standards.md, review-pr.

Why it left the merge queue: run 39433298601 failed arch-docs. The PR changes owned files (core-client, core-host, plugin-runtime, tree) and updates only social.md / team.md; on the branch the check passed because commit 6e7e9e6 carries a Docs-not-needed: line, but the queue squashes the PR title and body, and the body had none. Reproduced locally on a simulated squash (FAIL without the line, OK with it).

Changes: plain merges of origin/main 17af764 (#544) and 93dc3c9 (#551), no conflicts, generate gave no further change, topics.json equals main's; the merge commit and the PR body now carry Docs-not-needed: (copy-only string and comment updates; no subsystem doc names the old control). Diff vs main re-read: only the "Invite to this Bot" → "Sharing → Copy invite link" copy, its zh string, comments and one test assertion. Also merged 6824c61 (#547) locally (not pushed): clean, verify green.

Tip SHA: ae902933acaf8bc2ec68c55a044dec654838994d
Ran:
  - ARCH_DOCS_BASE=origin/main TZ=UTC npm run verify (Node 24.21.0) → pass (core 1129/0, social 313/0, tree 83/0, timeline 93/0, scripts 93/0, interop 37/0, live-e2e 16/0; arch-docs OK 24 files)
  - node scripts/ds-bot-patches.mjs check → pass
  - arch-docs on a simulated squash onto origin/main: without trailer → fail, with trailer → pass
  - dev/bench.sh + node dev/smoke.mjs (DSH 0.2.0-rc.2, mock model) → pass, 42/42 steps
  - local merge with origin/main 6824c61 (#547) + verify → pass
  - GitHub CI at tip (tests-ok and all jobs) → pass
Not run:
  - Desktop app manual check — copy-only change
  - real-model run — mock model only
Verdict: PASS

No actionable findings. This report is not merge authority.

@Birfy

Birfy commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator Author

Re-queued: originally owner-queued; it left the queue only because the squash body lacked the Docs-not-needed line (arch-docs). No change to the reviewed copy.

@Birfy
Birfy added this pull request to the merge queue Oct 20, 2026
Merged via the queue into ThinkFlowLab:main with commit 4537462 Oct 20, 2026
8 checks passed
@Birfy
Birfy deleted the fix/506-invite-copy-leftovers branch October 20, 2026 14:19
@Birfy Birfy removed awaiting-approval PR is green and waits for the maintainer's approval (T2/T3) or a review PASS at its tip agent-pr Pull request opened by an agent labels Oct 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:social Friends, invites, grants, Bot Social area:ui Web/desktop UI and copy bug Something isn't working risk:T3 Risk tier T3 (needs a human approval), set by the controller from the diff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Host/core messages and zh strings still say 'Bot settings → Invite to this Bot' after #504

1 participant